Raise MSRV to Rust 1.80 #6105

ErichDonGubler · 2024-08-12T11:51:57Z

~~Depends on #6147.~~

~~Depends on #6180.~~

ErichDonGubler · 2024-08-12T12:29:17Z

Heeey, we're finally running into the same annoying errors here that I wasn't sure what to do with locally when I saw them:

error: trait `ContextId` is never used
  --> wgpu/src/context.rs:25:11
   |
25 | pub trait ContextId: Into<ObjectId> + From<ObjectId> + Debug + 'static {}
   |           ^^^^^^^^^
   |
   = note: `-D dead-code` implied by `-D warnings`
   = help: to override `-D warnings` add `#[allow(dead_code)]`

error: methods `device_downlevel_properties`, `device_mark_lost`, `render_bundle_encoder_multi_draw_indirect`, `render_bundle_encoder_multi_draw_indexed_indirect`, `render_bundle_encoder_multi_draw_indirect_count`, and `render_bundle_encoder_multi_draw_indexed_indirect_count` are never used
   --> wgpu/src/context.rs:190:8
    |
34  | pub trait Context: Debug + WasmNotSendSync + Sized {
    |           ------- methods in this trait
...
190 |     fn device_downlevel_properties(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
290 |     fn device_mark_lost(
    |        ^^^^^^^^^^^^^^^^
...
793 |     fn render_bundle_encoder_multi_draw_indirect(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
802 |     fn render_bundle_encoder_multi_draw_indexed_indirect(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
812 |     fn render_bundle_encoder_multi_draw_indirect_count(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
825 |     fn render_bundle_encoder_multi_draw_indexed_indirect_count(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: methods `device_downlevel_properties`, `device_mark_lost`, `render_bundle_encoder_multi_draw_indirect`, `render_bundle_encoder_multi_draw_indexed_indirect`, `render_bundle_encoder_multi_draw_indirect_count`, and `render_bundle_encoder_multi_draw_indexed_indirect_count` are never used
    --> wgpu/src/context.rs:1249:8
     |
1171 | pub(crate) trait DynContext: Debug + WasmNotSendSync {
     |                  ---------- methods in this trait
...
1249 |     fn device_downlevel_properties(
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
1349 |     fn device_mark_lost(&self, device: &ObjectId, device_data: &crate::Data, message: &str);
     |        ^^^^^^^^^^^^^^^^
...
1790 |     fn render_bundle_encoder_multi_draw_indirect(
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
1799 |     fn render_bundle_encoder_multi_draw_indexed_indirect(
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
1809 |     fn render_bundle_encoder_multi_draw_indirect_count(
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
1822 |     fn render_bundle_encoder_multi_draw_indexed_indirect_count(
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

    Checking naga-fuzz v0.0.0 (/Users/runner/work/wgpu/wgpu/naga/fuzz)
    Checking d3d12 v22.0.0 (/Users/runner/work/wgpu/wgpu/d3d12)
error: could not compile `wgpu` (lib) due to 3 previous errors

☝🏻 @cwfitzgerald, @Wumpf: Not sure how to best proceed here, but I haven't given it many brain cycles, either. Will dedicate more in the absence of feedback in the next day or so.

ErichDonGubler · 2024-08-13T07:56:19Z

Leaving this as a draft until we actually have the option to upgrade to Rust 1.80.

We might be able to hoist the upgrade to cfg_aliases out if katharostech/cfg_aliases#10 merges and is released.

naga/src/back/msl/mod.rs

cwfitzgerald · 2024-09-06T06:26:09Z

We can bump the repo msrv without the core msrv, so this doesn't need to block on ff

ErichDonGubler · 2024-09-06T13:39:21Z

@cwfitzgerald: This PR contains strictly backwards-incompatible changes, including in wgpu-core and wgpu-hal here. That's why I've kept this a draft and split out backwards-compatible changes repeatedly, trying to make CI green. I suppose we could reasonably split out the wgpu- and examples-specific changes for a separately mergeable PR! I don't think I'll be allocating the bandwidth for that for at least a week, but I'd be happy to review somebody who might do that before I did.

ErichDonGubler · 2024-09-06T13:39:38Z

Not sure why GL tests are failing. I suspect this PR is at fault, but I'm not sure yet.

Regressed in gfx-rs#5824.

Consumes [`cfg_aliases`#8](katharostech/cfg_aliases#8) to eliminate warnings from `rustc`.

This resolves remaining outstanding cases that offend [`--check-cfg` in Rust 1.80](https://blog.rust-lang.org/2024/07/25/Rust-1.80.0.html#checked-cfg-names-and-values) in `wgpu-core`.

…ck-cfg` in `wgpu_{hal,types}`

`std::mem::{size,align}_of{,_val}` was added to `std::prelude` in Rust 1.80; see [`rust`#123168](rust-lang/rust#123168).

ErichDonGubler added area: infrastructure Testing, building, coordinating issues kind: refactor Making existing function faster or nicer labels Aug 12, 2024

ErichDonGubler self-assigned this Aug 12, 2024

ErichDonGubler force-pushed the rust-lints-with-1.80 branch 6 times, most recently from 5b300f7 to 13db95e Compare August 12, 2024 12:26

ErichDonGubler force-pushed the rust-lints-with-1.80 branch 4 times, most recently from 3aa12e9 to b5973ab Compare August 12, 2024 12:53

ErichDonGubler mentioned this pull request Aug 12, 2024

chore: update deno #6068

Open

ErichDonGubler changed the title ~~Resolve yet more lints from Rust 1.80, but which are only resolvable in Rust 1.80 or newer~~ Resolve Rust 1.80 lints Aug 12, 2024

ErichDonGubler force-pushed the rust-lints-with-1.80 branch 2 times, most recently from a7cfba6 to 4e2f6ce Compare August 13, 2024 07:49

ErichDonGubler mentioned this pull request Aug 13, 2024

Satisfy Rust 1.77 lints #6104

Closed

This comment was marked as resolved.

Sign in to view

ErichDonGubler force-pushed the rust-lints-with-1.80 branch from 4e2f6ce to c229479 Compare August 23, 2024 14:30

ErichDonGubler mentioned this pull request Aug 23, 2024

Preempt unused_qualifications lints triggered in Rust 1.80 #6147

Merged

6 tasks

ErichDonGubler force-pushed the rust-lints-with-1.80 branch 3 times, most recently from b8278cb to 0adf9c8 Compare August 28, 2024 17:31

kornelski reviewed Aug 28, 2024

View reviewed changes

naga/src/back/msl/mod.rs Outdated Show resolved Hide resolved

ErichDonGubler mentioned this pull request Aug 28, 2024

Yet more preempting of Rust 1.80 lints #6180

Merged

6 tasks

ErichDonGubler force-pushed the rust-lints-with-1.80 branch 3 times, most recently from 8b2fa00 to da21df7 Compare September 5, 2024 12:48

ErichDonGubler mentioned this pull request Sep 5, 2024

Resolve lints for Rust 1.78-1.81 that can be preempted before upgrade #6225

Merged

6 tasks

ErichDonGubler force-pushed the rust-lints-with-1.80 branch from da21df7 to cdcc4b4 Compare September 5, 2024 19:07

ErichDonGubler changed the title ~~Resolve Rust 1.80 lints~~ Raise MSRV to Rust 1.80 Sep 5, 2024

ErichDonGubler force-pushed the rust-lints-with-1.80 branch 6 times, most recently from b592e24 to e7a9ca0 Compare September 6, 2024 00:39

ErichDonGubler force-pushed the rust-lints-with-1.80 branch from e7a9ca0 to a3c4571 Compare September 6, 2024 12:24

ErichDonGubler force-pushed the rust-lints-with-1.80 branch 3 times, most recently from ff0ed8f to d95e25f Compare September 19, 2024 16:18

ErichDonGubler added 10 commits September 19, 2024 13:48

chore: un-regress unused_qualifications lint in naga::front::spv

37ea2f1

Regressed in gfx-rs#5824.

WIP: build: update Rust 1.76 → 1.78

09aa8a0

chore: warn on clippy::ref_as_ptr

ac810c9

build(ci): update nightly 2024-01-31 → 2024-08-11

a024848

build: upgrade rust-version for Firefox crates 1.77.2 → 1.80.1

3bdf1b0

build: upgrade cfg_aliases 0.1.1 → 0.2.1

f055324

Consumes [`cfg_aliases`#8](katharostech/cfg_aliases#8) to eliminate warnings from `rustc`.

chore(core): allow wgpu_* cfg keys not exposed in features

2b9531d

This resolves remaining outstanding cases that offend [`--check-cfg` in Rust 1.80](https://blog.rust-lang.org/2024/07/25/Rust-1.80.0.html#checked-cfg-names-and-values) in `wgpu-core`.

chore: add web_sys_unstable_apis to `lints.rust.unexpected_cfgs.che…

a9fa94c

…ck-cfg` in `wgpu_{hal,types}`

chore(benches): add tracy to lints.rust.unexpected_cfgs.check-cfg

b92480d

chore: remove std::mem::* imports now unnecessary with Rust 1.80

023a41c

`std::mem::{size,align}_of{,_val}` was added to `std::prelude` in Rust 1.80; see [`rust`#123168](rust-lang/rust#123168).

ErichDonGubler force-pushed the rust-lints-with-1.80 branch from d95e25f to 023a41c Compare September 19, 2024 17:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Raise MSRV to Rust 1.80 #6105

Raise MSRV to Rust 1.80 #6105

ErichDonGubler commented Aug 12, 2024 •

edited

Loading

ErichDonGubler commented Aug 12, 2024

ErichDonGubler commented Aug 13, 2024

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

cwfitzgerald commented Sep 6, 2024

ErichDonGubler commented Sep 6, 2024

ErichDonGubler commented Sep 6, 2024

Raise MSRV to Rust 1.80 #6105

Are you sure you want to change the base?

Raise MSRV to Rust 1.80 #6105

Conversation

ErichDonGubler commented Aug 12, 2024 • edited Loading

ErichDonGubler commented Aug 12, 2024

ErichDonGubler commented Aug 13, 2024

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

cwfitzgerald commented Sep 6, 2024

ErichDonGubler commented Sep 6, 2024

ErichDonGubler commented Sep 6, 2024

ErichDonGubler commented Aug 12, 2024 •

edited

Loading